Auto merge of #2769 - alexcrichton:no-oom-travis, r=alexcrichton
authorbors <bors@rust-lang.org>
Sun, 5 Jun 2016 06:06:58 +0000 (23:06 -0700)
committerbors <bors@rust-lang.org>
Sun, 5 Jun 2016 06:06:58 +0000 (23:06 -0700)
Pass -j1 on Travis

Looks like if we do things concurrently we hit the OOM killer, so let's not do
that!


Trivial merge